bitkeeper revision 1.1249 (42387345w4RJ2RC5ifMnONI8xxsgWA)
authorrneugeba@wyvis.research.intel-research.net <rneugeba@wyvis.research.intel-research.net>
Wed, 16 Mar 2005 17:56:21 +0000 (17:56 +0000)
committerrneugeba@wyvis.research.intel-research.net <rneugeba@wyvis.research.intel-research.net>
Wed, 16 Mar 2005 17:56:21 +0000 (17:56 +0000)
commit4f6133288a786d887c86485e79bb301ded322465
treeb788b24c7d807cca3789cb52231ee5469fe9ee9d
parent8ab75a0f10a0a8ea4466009dcabad0d6113d1770
parentc5ad7bd0fa0b6d8248cf2c41bb5671c259f5a56d
bitkeeper revision 1.1249 (42387345w4RJ2RC5ifMnONI8xxsgWA)

manual merge with michaels latest

Signed-off-by: michael.fetterman@cl.cam.ac.uk
.rootkeys
xen/arch/x86/mm.c
xen/drivers/char/console.c
xen/include/xen/perfc_defn.h
~/audit.c